From a16a25151c99a42efc3e7d30c950d67de6074fbe Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 1 Nov 2017 19:28:57 -0400
Subject: [PATCH] Drop GdkScreen from public api

It is still used by some of the backends, so keep the
files around.
---
 gdk/gdk-autocleanup.h     | 1 -
 gdk/gdk.h                 | 1 -
 gdk/gdkapplaunchcontext.h | 1 -
 gdk/gdkscreen.h           | 2 --
 gdk/meson.build           | 1 -
 5 files changed, 6 deletions(-)

diff --git a/gdk/gdk-autocleanup.h b/gdk/gdk-autocleanup.h
index 20c048f8ee..4941827663 100644
--- a/gdk/gdk-autocleanup.h
+++ b/gdk/gdk-autocleanup.h
@@ -31,7 +31,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDragContext, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkFrameClock, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkGLContext, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkKeymap, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkScreen, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkWindow, g_object_unref)
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkEvent, gdk_event_free)
diff --git a/gdk/gdk.h b/gdk/gdk.h
index 945f8f885d..5ec87bbcbc 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -55,7 +55,6 @@
 #include <gdk/gdkproperty.h>
 #include <gdk/gdkrectangle.h>
 #include <gdk/gdkrgba.h>
-#include <gdk/gdkscreen.h>
 #include <gdk/gdkseat.h>
 #include <gdk/gdkselection.h>
 #include <gdk/gdkthreads.h>
diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h
index 739fad43b4..9c9d739bba 100644
--- a/gdk/gdkapplaunchcontext.h
+++ b/gdk/gdkapplaunchcontext.h
@@ -28,7 +28,6 @@
 #include <gio/gio.h>
 #include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
-#include <gdk/gdkscreen.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h
index 07dac9af56..c6a99fc05f 100644
--- a/gdk/gdkscreen.h
+++ b/gdk/gdkscreen.h
@@ -38,10 +38,8 @@ G_BEGIN_DECLS
 #define GDK_IS_SCREEN(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_SCREEN))
 
 
-GDK_AVAILABLE_IN_ALL
 GType        gdk_screen_get_type              (void) G_GNUC_CONST;
 
-GDK_AVAILABLE_IN_ALL
 GdkDisplay * gdk_screen_get_display           (GdkScreen   *screen);
 
 G_END_DECLS
diff --git a/gdk/meson.build b/gdk/meson.build
index c14a8a692b..9857dc3976 100644
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -66,7 +66,6 @@ gdk_public_headers = files([
   'gdkproperty.h',
   'gdkrectangle.h',
   'gdkrgba.h',
-  'gdkscreen.h',
   'gdkseat.h',
   'gdkselection.h',
   'gdkthreads.h',
-- 
2.30.2